Merge version 1:13.0.1-9+rpi1 and 1:13.0.1-10 to produce 1:13.0.1-10+rpi1

diff --cc debian/changelog
index 787f6183b6c0950233308074f3bd4820ad4e968d,484cfe075c5b05ca0c5793fbe439ca2a7a509abc..7252570d67f2a8676dd57998d4744dbb54700cb3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,52 -1,10 +1,60 @@@
- llvm-toolchain-13 (1:13.0.1-9+rpi1) bookworm-staging; urgency=medium
++llvm-toolchain-13 (1:13.0.1-10+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Cleanup .pyc files in clean target.
 +  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
 +    based build relies on config.guess which assumes you want to build for the
 +    hardware you are running on).
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +
 +  [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
 +  * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
 +  * Clean up debian/usr in clean target.
 +  * Clean up clang/tools/*-3.9 in clean target.
 +  * Clean up stray *3.9.vim files
 +  * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
 +  * Clean up debian/*.install
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green]
 +  * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain
 +    about it not existing.
 +  * clean up more crap left behind by build process.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
 +  * Change triplet in debian/rules to use armv6k rather than armv7l
 +
 +  [changes introduced in llvm-toolchain-12 1:12.0.1-16 by Peter Michael Green]
 +  * Disable llvm libunwind on armhf, it seems to come out armv7 contaminated.
 +
 +  [changes introduced in llvm-toolchain-13 (1:13.0.0-9+rpi1 by Peter Michael Green]
 +  * Disable scudo on armhf, it needs atomics which we do not want to enable.
 +
 +  [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 23 Nov 2021 22:37:30 +0000]
 +  * Remove armhf from architecture list for libunwind-13-dev dependency.
 +
 +  [changes introduced in 1:13.0.1-9+rpi1 by Peter Michael Green]
 +  * Apply patch from László Böszörményi (GCS) for protobuf 3.21 (Closes: #1023532)
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 01 Dec 2022 16:32:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 24 Dec 2022 10:30:24 +0000
++
+ llvm-toolchain-13 (1:13.0.1-10) unstable; urgency=medium
+ 
+   * cherry-pick the cmake workaround from 14 (Closes: #1024183)
+   * Unbreak the build with a new version protobuf
+     Thanks to gcs for the patch (Closes: #1023532)
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 18 Nov 2022 09:47:27 +0100
  
  llvm-toolchain-13 (1:13.0.1-9) unstable; urgency=medium
  

diff --cc debian/patches/series
index 36d8b6fb1cc7722233eb2563d4e9be0a38e1332d,5cebdf0c632f838aec2fcfae539f58146e0f1c07..d1bab198b373315c7d98a3815185d41a094de010
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -134,5 -161,4 +134,6 @@@ yaml2obj-COFF-Allow-variable-number-of-
  llvm-objcopy-COFF-Fix-test-for-debug-dir-presence.patch
  lldb/lldb-swig-2.diff
  lldb/lldb-swig.diff
+ protobuf_llvm_13.0.1-8.patch
 +raspbian-triplet.patch
 +protobuf-3.21.patch

diff --cc debian/rules
Simple merge